filling some stuff out
:wq
filled out some skeleton methods, added comments
Merge pull request #1 from savannaking/master

Adding stuff