Massive restructuring: I finally have sth working