Feature 30 wip
more wip in f30