Take in some of Faiz's code, clean up forms, add property selection etc