Finished fluent first pass, will add tests soon