Javelin M24 I believe is what I am going to get. From what I understand it is full APS-2 compatible and has roughly the same external texturing, and the quality as the E1 M28. Now I just need to decide what I want upgraded and what the most important to upgrade.