master commit 2

table somewhat working