starting to fix the organization of stuff