Re-Order
Re add some stuff
Merge pull request #1 from X-ROM/test

Re Order...