We might as well do all of this from this constructor

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>