Massive rework- add/new files are now functional