added more wrappers, got everything else closer to running