Major clean up and admittance of former code

Fixed persistance, added back modified Carbon code, and cleaned stuff up
This brings us up to date w/ Carbon's build minus our own additions

Change-Id: Ie54951cecd05c1c281011d878242fca8080903b8