It's all loopy now
Fixed merge conflicts