checkpoint commit
more refactoring
more refactors.  not done yet with everything I want to do, but i'm pushing so I can pull it down on my desktop since I just got home