WIP working off trunk and maybe tags, not fully tested, not fully ready for PR