Looking a lot better; might actually be working