Jim work

As usual, pushing standard changes to master. This will happen often.