in progress fixes to get code working
fixes to get code working (but doesn't do much b/c no template support yet)