WIP: Fixing Bugs