Started Merging Moe's code