Cleaned up a lot, added byob boolean
Added fields