Big refactor, especially generalizing speed to action