Add main program and various other changes

[dhdaines]

This was supposed to be two PRs but git sucks and you should never use git rebase for anything, ever