Decided I hated returning arrays, changed it to objects