Second commit after a pair program session. Lots added here.