still need to finish up views, but looking good