initial commit of second overhaul