almost ready state, just a bit of glue-ing left