clean up. rewrite mod from scratch.. ish