Pp branch

Changed some design stuff.