interim coding, lotsa stuff broken