Cleans up Extension, progress on Wrapper