finish 6, make it modular!