added TODOs, ready to migrate to new Scene