Small update until I can finish this up.