Updated todos / moved to service for demo