Again changing the constructor implementation. I'm not sold on this
style but it will do for now...