Attempt to general rewrite. Need to get rid of this ugly
feature/slash/hack!!!