Back testing & tidyup...