added movement, although not very cleanly...