Moved more code to cyvmath, added movement data