Removed most of the pointers, replaced with Arr class