Just a few small code changes left to do until we have compiling code