Latest code
Cleaned up some code

Not recommended for use! Wait until we've fixed it