Finished major overhaul of code refactor, most things in place.