Pulling in all the changes from alpha-4
Adding the new files I forgot to add from alpha-4 in previous commit