Cleaning more things up and GETTING TESTS TO PASS!