Master should work all good, I spent a good deal of time getting this right and re-enabling commented out tests this week