Starting another rewrite. No tags!