Revert "Revert "Started updating to object literal notation""

This reverts commit 3aae33d9277d348504c9285302ceb3c380168f4b.