Starts refactoring
Moves most methods into array class