Inital commit. Completes steps 1-6