The beginning of making this modular