IDI-104: All functioning. Needs clean-up