got rid of swap.sf
finishing merge
started adding ArrayLiteral.java, needs work,