About time! Still needs some changes here and there, but it is on the right track.