Just to try what's what with the merge.

And added some constructors here end there
I really just hope for mirracle
Some magic maybe?