Changing to new structure. NOT WORKING.
Rework working
Auto resizing
Incorporating changes from @bakercp's pull request to master: 84852322ff
Merge branch 'rework'