Moved things around and started algorithm work.