Wrote overhauled edition: Stored in separate file, will past after V0.3
Overhauled commit fix
Merge branch 'daryl_storage'