Minor changes. Going to restructure solution in next commit.