Cleaned and added new (hopefully) working project