I really should start testing stuff before commit