Bug fix, and is completly functional.