Ironed out some small details. Refactored out wrapper classes