Step on - tests, structure almost working.