Redesign to use Lagom