Add Type Safety checks for............. sanity....?