PA1 pretty much done, need to test more, todo updated