Updated Basic API per requested features; WIP