Wired up all views. Refractored the way objects were returned.