Began adding dependencies and wrappers