milker wip and big refactors