Removed stuff that's not working, added them as todos instead