Got all the advanced functionality working.