Commit #47

Nearing completion. D: