Reupload of stuff done today (added buildings and more macros)