Fixes to formatting, passing back the data correctly now so I can make the user experience cooler