Fixed IDs / Made forward more general / stuff