This seems like a much better way to lay this out