Add ability to choose name
	Very hacked together