Java comp indexes

THIS IS NOT READY TO BE MERGED