Version 1 of refactor

Updated 2002-10-22 21:40:29