Work in progress on implementing tests and code for core class