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