Started on data storage
Cleaned up stuff