Merge RestAPI with basic funcionality

see above.