more cases addressed, more tests written. Arrays not working at present