mo clean, less problems
oops. this should have been in a different branch