Revamped run system. fixes #6