go fmt
Copy stats over, too
Move types to better place