Lazy day, tightened typing on the program

The program compiles, sans any non-working elements from the previous
commit