Get stub middleware functioning
Fix collisions