manual almost done, started adding suffix support