Add some newlines for prettification
Update the todo list
State machine stub code (still planning)