Break out into multiple classes
Break out into multiple classes
Add size to fixed fields
Remove unused import
Remove bit of debugging