Further hacking. Some actual success at runtime now.