oops havent commited in long time, here goes