Fixing more bugs. Getting closer. This is fun