Cleaning up build environment
Also adding array code for.  Test cases not written yet.