Further testing and bug fixing, still doesn't work...