Began work on porting form code to form popup.