Cleaned up code.  Made a menu.  Added BML support