new main

This is the now non broken main