I make quick modifications for now! Much more to come.