Latest advancements. Not compiling yet, though