BS: Service is functionally complete, but needs a refactor