Some more integration with new functions
Rest of changes for features

Does not compile