intial comit for 2.0 redesign