Moving more code into Lopa class to make testing easier.