WIP

On my way to a working API