This project builds now. Bill did some general clean up and added packages and imports so that it actually compiles