uncommited changes I forgot about.

rewritten things