Up to working, runnable version.