Finish logic

Need to clean up output