components working!
cleaning up router