Saving these here for now till I fix up the other branches.