Merging Meagan's recent commits