fixed breaking bugs.  now just need to find logical bug