Initial commit
squished master over into dev