WIP on fixing overloading
Fixed most of the known issues