Working on type checking. Committing to be safe