Refactored array stuff and specs accordingly.