aba_generic model implemented, files refactored to allow adding more models