[BROKEN] Added more step foundation and broke stuff