Marks to-dos for decoupling swing