More work done in extract_desktop.py