Starting anew. This will be a lot neater, maybe a little different.