Changes allowing program to compile

Have not tried running it yet, so there may be more bugs.