More work, mostly dummy classes, many things to finish