Output first update

Might still be some errors, but this should at least get it to load