finishing (first draft) of requested PM infrastructure