Added initial commit, with some problems solved