Wooo. That system was so crappy and not even planned out in the start.

Glad to see we have a brave soul to fix it!