v3.0 sprint cleaning and integreting Tup