WIP - More changes (still won't compile)