Added more functionality and started adding selection list