Move bike logic to core