3rd Commit

Many updates. Work without friction for now to make sure base of
program is functional.