Continued dev on `service` and some js components.