put things in a table and stuff
Merge pull request #1 from Hyphen-ated/master

put things in a table and stuff