A lot of edits (Lazy designer- not commiting)

A lot of design implemented and this is a rather large commit.