user blueprint, tests, various fixes - ready!