Major Update

Most of the design