Lots of updates - been a while. Mostly dealing with updating the build tests