Almost completed my conversion