Lots of renames, finished backing store approach, added console tester