#50 - save source as vstp
remove dynamic and use class
improve performance by looking up db id
misc