re-engineering successful.

now needs some housecleaning