Mostly just added UCS builds to functions. Other small changes. Preparing to add a lot of framework