First fleshed out pass