working on application side.. simplifying to single table modes.