Added some things and begin work on A2 formats