LAST COMMIT!!

May this application rest in peace