added final step
cleanup
added TODO