No more moves detection

Still buggy... needs work.