Restructured core (STILL not getting response codes!)