Fixes multiple terms and factors
Begin adding list primitives