Joe's Changes

Not quite done