10/27/14 (refactor done, dragdrop stays in bounds)