Fixed everything

Made magic and the base for the application is made