Core API functionality implemented
Fixed Ceasar's issues