Added storage system, TODO: View class