SKELET-1 Adding a bunch of work before it gets lost.