almost final code for submission

I may clean it up a bit before we submit on Tuesday night.  But I prolly
won't cause I'm a lazy bastard