Starting to work on this a bit again.