worked on some stuff
Merge pull request #113 from HoltMaki/master

work in apgov