Initial build of add on