Bug Fixes. Method 3 still needs some work. Plus it's all an uncommented mess