cleaned up tons and probably going to do mvc style