Well.. It works. Gotta rewrite all the code!
Commit 2. Same things.