Andrew's project

Comments and some unit testing code.