Ok, let's start with this and add issues for the rest :dart: