Continued work on re-write