Actually tested it. Fixed initial round of bugs