Some thoughts. Bug still there. Cleanup