Almost ready to fully read/write from flash

Checking in before I fully switch over to flash