Core functionality complete, but untested