Got it in a working state again