Adding several options. Prepairing for express still