Filled out placeholder functions, first attempt at assignment