Added some comments, made most recent commit be working