trying out rebase for cleanliness