Resolve all @todo's in code

Problem/Motivation

There are still quite a few todo's in code, which need to get resolved.

Steps to reproduce

Proposed resolution

Resolve the @todo's in code.

Remaining tasks

User interface changes

API changes

Data model changes