Jon snow is still learning

removed stupid stuff, added some tests