Added quit option and (incomplete) method