Core added

Not finished yet