First cut at more psxtm tasks