**WIP:** V2.0

Rewrote it to be better.
OK I assume this is just part of WIP ... right?