Ok, I lied, renamed some stuff, version 1.0 - I swear!