Cleaned up a few things, made display table work, added methods to be completed