cleanup and started working on expression's.  just need to create an expression builder.