We shouldn't have 'todos' in the code. Let's use the ticket system to tr...

...ack this stuff