Added more code, weird elif problem to fix.