Not having a commited solution is annoying.
More structure