Fleshed out some functionality