Sweeping changes now that I have everything sorted out