intro done
working on routing and filtering
fixed merge errors