In progress dev (non-working); TODO comments