Add refactor to take out hard coding plus bootstrap