Lots of changes finishing up