got it basically working, going to add features and corrections now
Merge branch 'master' of github.com:stuycs-softdev/submissions