Got it to a working state