Refactored, redid move up/down logic