Mostly working, except for some weird linking error
Random fix...
Complete!