Reorganizing to prevent unable to access properties bugs.