Committing work. Almost done...fixing errors.