TODO adapt to pull the from from a subdirectory