Added Function, Added Option Parsing