massive update to split between this repo and macup