Working on spacing/sizing
Merging changes --- working on spacing
conflits RESOLVED!!!!