First upload, cleaning for tech demo