You are right. Marked for refactor later.