WIP - updating to refinery 2