PLEASE DO THESE THINGS-updated TODO