WIP: Fixing stuff that should works!