A Working Version

This version seems stable