Clean up, loop uses partial now
Merge branch 'development' of https://github.com/QuatreCentQuatre/caspian into development