First array solution
Some fixes