Redesign in progress
Merged requirements.txt