Code finished, bud it needs fixes