Yeah, you're right. We're gonna simplify this bit by bit. That is the important basis for now.

@raycoms already did this.