Progress

works in spec through bugspray