Working, but still need to add functionality to form