Updated Controller, added checkbox

Added numerous features