Fix #2 - Less geometry

Work in progress.