Structural redesign

Moved to grunt. Started adding user inputs/