Added defualt task
Did some more fiddling