Refactoring and bug fixes

Fixed bug where collision between moving box and line wasn't right.. so
just refactored to use collision between two moving boxes.