finished testing jumping jacks, cleaned up more files and code