woops, forgot to merge all the conflicts in last commit! :p