First pass working; working on second pass