ticking off the todos
more shuffling