Merging in some changes
Some unfinished stuff that doesn't work