Initial Commit after 1.5.2 re-write.