Slight refactor into .h file, created testing folder