- revised TODO by moving optional things into their own section