#3 Naive replacement
#3 Got tests to work
#3 Storage : Record done