minor
most of the functionality is converted