added more to the classes
Merge branch 'master' of https://github.com/iweaver/NSBE_Task
Merge remote-tracking branch 'origin/master'