fixing up some stuff and haveing a crappy app for tomorrow