better organization and shit