First round of stuff for the animation updates - there are probably a few bugs in here but ill fix them later
merging keyboard and animation stuff