Initial commit of enforcing types