Completed more functionality, Added Option class