Added everything I've done so far