Added in some functionality for pulling in data