Started adding options to setup form