More code, it's mostly working now.