Finished collections, Improved parser, Test working again.