Added some TODO notes based on test play yesterday