Working/ without the two custom objects for now