Cleaned up unnessesary logic
Added more tests
Removed odd command