BIG changes. Objectified the quantities tables, bug fixes, etc.

Signed-off-by: SturmB <sturm359@gmail.com>