Modularize and get running again