Laying the foundations

Set up to work with the new drink class