Improvement! More stuff! MOAR TESTS! TEST EM ALLLLLL!