(Broken!) Attempting to separate into multiple files