DELEATED STUFF
Merge pull request #99 from PJTNT11/master

sync up during 12/4 session