Refactor to use WooDojo code

Thanks guys!