Address data

switches base layer #14 and also tackles #27