Formatting issues; add P and C POSes
Migrate everything to main()