Closed #9, closed #12, and closed #16: Rebase ftw!