Modify conversion implementation and system design

Adjustments and modifications to make the report come together.