Added base constructor
WIP