Started storage class; merged cpp/cc