added functionality and fixed bugs
added file
fixed conflictts