Mostly done, few more things to make work.