Cleaned up charge state
Cleaned up
Merged to bring sandbox to master