big commit. makes it working