inital working version for review

@jarv @feanil 
nit: space