Add better movement handling and active once input handling