Api layer

Full app
remove comment?