Vik/dev

Get things ready for deployment.