Bug Fix: had to push hot swapping cursor logic down a layer to account for sth compilation; higher layer changes reverted