Output working needs to be cleaned up a bit more