Wrote more of basic framework, added locations system.