major refactor + testing compiled files