Merge RestAPI with basic funcionality

successful