moved some stuff around and started stacked code