Starting to fill in some methods a bit