Finish making this all make sense