almost done, zack&chris need to make layout pretty