added remaining work and a bit of system performance
Merge branch 'master' of https://github.com/luhkevin/seniorproject