almost working...
added new files, almost working..