final commit 4/6/14, re:structures, still need votes