More or less in a working state now