Cleaning up and fixing todos
Testing the has functionality