Cleaned up the wrls; now contains just outline of final structure
Merge