diff --git a/crontab_2017-12-16 b/crontab_2017-12-16
new file mode 100644
index 0000000..d6939e5
--- /dev/null
+++ b/crontab_2017-12-16
@@ -0,0 +1,48 @@
+# Edit this file to introduce tasks to be run by cron.
+# 
+# Each task to run has to be defined through a single line
+# indicating with different fields when the task will be run
+# and what command to run for the task
+# 
+# To define the time you can provide concrete values for
+# minute (m), hour (h), day of month (dom), month (mon),
+# and day of week (dow) or use '*' in these fields (for 'any').# 
+# Notice that tasks will be started based on the cron's system
+# daemon's notion of time and timezones.
+# 
+# Output of the crontab jobs (including errors) is sent through
+# email to the user the crontab file belongs to (unless redirected).
+# 
+# For example, you can run a backup of all your user accounts
+# at 5 a.m every week with:
+# 0 5 * * 1 tar -zcf /var/backups/home.tgz /home/
+# 
+# For more information see the manual pages of crontab(5) and cron(8)
+# 
+# m h  dom mon dow   command
+
+
+### homeassistant / tradfri light fader
+
+
+# dim from 4k to warm white
+30 17 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py office_table transition color_temp=2800 minutes=181
+30 17 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py geo_desk transition color_temp=2600 minutes=181
+01 17 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py right_desk transition color_temp=2800 minutes=181
+15 17 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py office_uplight transition color_temp=2900 minutes=181
+
+# dim to 2200k
+00 21 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py office_table transition color_temp=2200 minutes=121
+00 21 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py geo_desk transition color_temp=2200 minutes=121
+30 20 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py right_desk transition color_temp=2200 minutes=121
+31 20 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py office_uplight transition color_temp=2200 minutes=123
+
+# turn down brightness / off
+15 18 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py office_uplight transition brightness=80 minutes=151
+00 22 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py office_table transition brightness=0 minutes=180
+00 22 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py geo_desk transition brightness=0 minutes=110
+00 22 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py right_desk transition brightness=0 minutes=130
+30 21 * * * /usr/bin/python3 /home/pidax/light-timer/light-schedule.py office_uplight transition brightness=0 minutes=163
+
+
+
diff --git a/light-schedule.py b/light-schedule.py
index 422907a..de3f1ef 100644
--- a/light-schedule.py
+++ b/light-schedule.py
@@ -12,14 +12,22 @@
 
 devices = { 
 	"office_table": { 
-#		"entity_id": "light.tradfri_bulb_e26_ws_opal_980lm"
 		"entity_id": "light.980_e26"
 	},
 
 	"geo_desk": {
-#		"entity_id": "light.tradfri_bulb_e12_ws_opal_400lm_2"
 		"entity_id": "light.400_e12"
+	},
+
+	"right_desk": {
+		"entity_id": "light.400lm_gu10"
+	},
+
+	"office_uplight": {
+		"entity_id": "light.950lm_e26_clear"
 	}
+
+
 }
 
 
@@ -153,7 +161,7 @@ def parse_transition_params(params):
 	resp = func(func_input)
 
 elif args.action in ['set_brightness','set_color','mireds_to_kelvin','kelvin_to_mireds']:
-	resp = func(int(params[0]))
+	resp = func(int(args.params[0]))
 
 # Above are just the commonly used functions.
 # There's nothing to stop user from calling a lower-level/internal function here, but args won't be used, so some may fail.