More updates. Still getting things working.