WIP more logic #4600