Finished converting to C++, started developing further.