Major changes complete. Ready to push with a little more testing.