Possibly fixed a bug with InvalidStateError
Updating Berries and commiting a bunch of additional changes
Added final bits for graphics class