Fixed & Working

Ready to merge