Panic commit after some coding and re-arranging, let's see where we are.