Starting to add Stack resolution codez