wip
checkpoint
elastic
remove old stuff