current state seems to work

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>
another WIP that seems to work

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>