Clean up roller implementation! it just doesn't roll yet...