WIP removing 5D-isms