TODO added for reminder to comment parse steps