Testing & Bug Fixing WIP