Woops forgot that public import
Unneeded functions
Unneeded functions
More declarations