merge conflict
the support + action flow is better now.
got the comments into tables, looks better, still needs love.
added indecies where i forgot them
merge conflicts