now supports if you use underscore. Not entirely sure how I want the structure yet.