Pushing in latest updates, will rebase