Updated to what I have locally, beware of unfinished stuff