Refactored some more, boundaries are no longer static
More refactoring