prestudy: Initial rewrite of use cases