Modified task zero

Still in progress