#7: Improved baseline implementations
#7: More flow layout work