I changed the movement to block-by-block movement instead of free movement. This makes collision much easier for sure. I find it also makes the gameplay far more simple. The directional block still are not moving, but that is next.