Initial Changes

Not fully working but rest service is fine!!