Made changes to get closer to being able to compile.