Figured out how to orginize things a little bit better