initial commit + minor functionality