Added multiple functions for fixed and variable layouts.  First step
for Issue #35