pop stack properly, add more methods.. still need tests