poked at adding diff stuff but gave up and just left some todos