Added put back some option to work order parts, also added TODO item, as well as more tweaks