Major Overhaul

Change-Id: I16a0e0cb3aca4c814e5fc502afeb70999693ba71