Initial commit of basic register/resolve functionality