Much needed overhaul to read me