Some work on making it availabke to android