First pass at rpo and pakage stuff