mockup and refactor a bit