I was tired last night... wrappers for wrapper, dammit. (cleaned up some code)