move changes back into add_debug
more back updates
more again
move comments up to add_debug
Merge branch 'implementuser' into add_debug
move comments into here from impl_user