Fixed names, Added basic structure