Finish instance support - closes #3