add hapstack
todo maintenance