added as proper TODO notes