Modulerized sorta, still bad probably