Inline some things
All tests passing