First commit
again
finalized hurray