Initial Commit Since 2PM, was working on design