trying to merge
fixed some merges
hooked up sidekick
delayed version works yeeeeeyyy