Third commit, with ArrayQueue and some methods