moved more stuff over to routine, got some specs working