Finished merging the latest postiats repo into my SMT revisions