Added Justin's comments back in (Sorry Justin I forgot to pull before last commit), removed unneccessary files.