Still some bugs, but less prententious...