wip
wip again
Cyndys comments