Wooly melbourne

Updated Wooly code based on code from Melbourne