Adding rough start of persistence and services