todo: Update with some of my current issues