First commit of rmi calc tbs