more WIP - amost there