Almost finished consultant

Also some minor changes to other classes