organizes into more of mvc format