Refactored tasks; added base task; add cube comments