wip
lots of improvements, ready to correctly bootstrap it