New features need to remove todos and update pictures