Initial build for class assignment
Initial build for class exercise with final fixes