Ready for addon check to come back in
Must closer to a functional system