added basic stuff, need to display table