Working, and as cleaned up as it will probably get.