Closes #2 and #4 yolo