Modularize attempt