Yesterday I had a plan to clean up my network a bit and get rid of the rest of these passive injectors with a nice clean switch.
So I went to the local office supply store and grabbed a DLink switch. The funny thing is that it didn't work. Not sure why, but it would only work with manufactured cables, not the ones that I ran through the house.
I spent about 2 hours troubleshooting and in the end I had to build this.
Its not as pretty as I was planning, but it is a lot better than what was there.