Adding Options and Controls... Initial pass, more functionality needs to be added...