Merge RestAPI with basic funcionality

?