#7 Implemented wrapper, still need to make it work within the validation process. Also changed some names around.