Working and looking good! Probably first release but will test later