Merge RestAPI with basic funcionality

than