-Model and Service done v0.2