Adding daily/weekly and working on form