Remodel

Signed-off-by: AdamHjerpe <Adam.Hjerpe@hotmail.com>
Remodel further

Signed-off-by: AdamHjerpe <Adam.Hjerpe@hotmail.com>
Remodel further

Signed-off-by: AdamHjerpe <Adam.Hjerpe@hotmail.com>