All functionality is in place, just needs a good clean