added forwardfill work
fixed merging conflicts