Added a luncher and more handlers