Added functionality(hopefully)!