Changed project draft, added rough functionality