Save up commit in case I break everything, next commit will have every
object in an array & object will be more dynamic.