wip code and forum working after er diagram change