Get rid of dummy data
Add units list preference