Rejigged layout and stubbed out a unit test.