Mostly finsished :)