Updated

Getting towards base functionality.
Not functional yet.