Got stuff kind of working.
Merge.