Finished main structure, awaiting for tests and fixes