pulled table stuff into a super class, where it belongs
added annotated table