Done filling in rough first pass (maybe done!?)