initial cleanup... rewrite incomming
asd