Refactor Going to use Push/Pop operations

Step one to supporting select statements