More or less done

yay!