Modularize/Streamline interface

2 jobs for master in 14 seconds (queued for 2 seconds)