Merge attempt #2

Somehow the cycle models got removed in that last merge..