In progress tests and implementations of Baxter's functionality in C++