5,madigan6: Cleaned up code, adding list for useworkoutactivity