implemented moves + bugfix

all relevant tests in the test file now pass.