Add Set logic, build still not working...