more features

not ready for prime time but getting there