Version 1.7

Full rebuild