EOD 10/16/2013

Got states working!