First commit - almost done (good enough).