First commit, branches off of older Multir development