Custom entities almost finished