Now just have to work out minor encapsulation error.