Modularizing in-progress. Still not working.