Refactored Building process to use the full data provided by the api, makes loading blazing fast =)