beginning modularization, boooooo