INSANE REFACTORING. probably broke EVERYTHING.fixes #20 AND MORE
missing fiels for INSANE REFACTORING.
fixups for insane refactoring. Seems to work pretty good!!