wip extra goodness
merge