Fixed order bug, implemented searching

Finished and tested assignment, ready to submit!
Cleaned up

Cleaned up comments