Integration of Ben's new resolution stuff