merge rust-rendering-2 to master
restructuring
fix issue with not ppopping to clear stack with an expression statement
a few tests