going to have to cleanup types when I am not sick