havent commited in a while, basic functionality