Get movement correct
Add filters