it was annoying me
Merge remote-tracking branch 'origin/leif'
Added some classes

Added some info and classes
Fixed framework and added movement correlation

fun stuff with movement
Merge remote-tracking branch 'origin/master' into leif