Added files from Alissa. Modified a couple of things ;)