Merge tag 'working'

All test accounts work
comment out debugging statements