Fix #16.
Clean up feature, mark as wip.
clean up steps