updated to vs2013 and class structure