Made more work, with some hardcoding.
Merge branch 'feature/placement' into develop