Temp Submit

Submitting code mid change for safe keeping
Starting to transform data and models for the Layout Tool into proper
structure