Add features and first part of analysis