Merge RestAPI with basic funcionality

unintended change?