Almost finished, added more dropdown options