barebones skeleton
dumb merge