Re-worked data storage
Added messages