Starting working on wrapper classes