Moved over to a different namespace to avoid collision with offical app. Cleaned up some code.