Work in progress commit; working on expressions