cleaning up options
working on workout saving
merging