More wip for b2g