getting close to functinality
one last bug?