Vik/dev

@a-laughlin please review.