Refactored runlist, fixes #27