Added bottle app
and cleaned up the old stuff