Improvements. Now functional.