Convert motion selectors to classes, add new timing functions