Making progress on interface, api
Merged gruntfile