Fleshed out some methods