#26 - move location info into separate block