Fixing this darn thing to properly use the custom objects