Some nice progression on the implementation, more work on persistance