added first step towards Metro interface

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>
Bug fixes

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>