stupid temporary merge- public folder complaining
merge fix, had to add temp classes