Updated Inheritance, Added Screens