Moved stuff around and cleaned up code
Added first basic test
Added basic pie chart test
Basic column test