More work on Grunt. Still need to move directories around a bit tho