Added some top of mind todos