1.1 wip [new features]