Added export decorators to EVERYTHING, time to figure out what we need to export and what should stay internal