First step towards making code work with boundaries.