Update v2.0b

- Complete overhaul of the original system, and is a lot cleaner code
wise.