Fixed all to a working system, still the structure is missing