Finished for now. Made changes.