Refactored
Added data storage functionality.