this should be better
much cleaner
ill wrangle this yet
hurray
removed dir stuff