basically finished this shit

sorry megacommit - deal with it