Committing before I pull cube functionality
Conflict resolved