More updates. Everything but the main controller module should be done now... until I change more stuff, of course.