Added propper core - updated api prototype (lazy, gonna add api tomorrow)