Core functions rethought and rebuilt.