Feature tables

pull reques to merge branches. Everything is done in the new branch anyways