Victorvilla tk 02241 task model

There are tow different commits