More Additions, rewworked some of the design.