Lots of weekend code changes