Some additions, still works weird.