Refactored boundary
Stupid idea files...