Working without passages
Working... Need to clean up.