More updates. Working fairly well.