simplify?
chaos? merging with vs2013