Functional boundary.

Organized code better in addition to finishing the boundary.