add proper resource loading & begin to fix stacks