First pass complete, sure stuff is missing