adding grunt and new features