Adds TODO brainstorms and changes to view