Done: merge service and controller code, encrypt client-side data with forge