Changed back to old/current structure. This is so fun! :)