2.00 WIP 3

WIP files.
Use it at your own risk.