WIP - user blueprint, tests, various fixes