PROGRESS!!

first type seems to be working