90% of resizing done
Merge branch 'Austin's-Branch'