Added everything i've done so far