Adds code before big refactor