Start work on #121
-Still need to change all the checks