Fleshed out some stuff