Updates from @Yakaroo
Still WIP