Added additional work. Almost finished.