Almost finished functionality

Only few small bugs are left but in general the project is ready