Temp dev - Working Version

Got a reasonable working version. Simple, manual tests on this (nothing automated).