Merge pull request #20 from beta382/Wes

Colors, Box for next, See below
Merge pull request #24 from beta382/Austin

Austin