Routed around modular bugs to keep functionality for now; fixed last line issue.