diff --git a/sqlx-core/src/arguments.rs b/sqlx-core/src/arguments.rs
new file mode 100644
index 00000000..ee518191
--- /dev/null
+++ b/sqlx-core/src/arguments.rs
@@ -0,0 +1,169 @@
+use crate::database::HasOutput;
+use crate::{encode, Database, TypeEncode};
+
+/// A collection of arguments to be applied to a prepared statement.
+///
+/// This container allows for a heterogeneous list of positional and named
+/// arguments to be collected before executing the query.
+///
+/// The [`Query`] object uses an internal `Arguments` collection.
+///
+pub struct Arguments<'a, Db: Database> {
+    named: Vec<(&'a str, Argument<'a, Db>)>,
+    positional: Vec<Argument<'a, Db>>,
+}
+
+/// A single argument to be applied to a prepared statement.
+pub struct Argument<'a, Db: Database> {
+    unchecked: bool,
+
+    // TODO: we might want to allow binding to Box<dyn TypeEncode<Db>>
+    //       this would allow an Owned storage of values
+    value: &'a dyn TypeEncode<Db>,
+}
+
+impl<Db: Database> Default for Arguments<'_, Db> {
+    fn default() -> Self {
+        Self { named: Vec::new(), positional: Vec::new() }
+    }
+}
+
+impl<'a, Db: Database> Arguments<'a, Db> {
+    /// Creates an empty `Arguments`.
+    #[must_use]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Add a value to the end of the arguments collection.
+    ///
+    /// When the argument is applied to a prepared statement, its type will be checked
+    /// for compatibility against the expected type from the database. As an example, given a
+    /// SQL expression such as `SELECT * FROM table WHERE field = {}`, if `field` is an integer type
+    /// and you attempt to bind a `&str` in Rust, an incompatible type error will be raised.
+    ///
+    pub fn add<T: 'a + TypeEncode<Db>>(&mut self, value: &'a T) {
+        self.positional.push(Argument { value, unchecked: false });
+    }
+
+    /// Add an unchecked value to the end of the arguments collection.
+    ///
+    /// When the argument is applied to a prepared statement, its type will not be checked
+    /// against the expected type from the database. Further, in PostgreSQL, the argument type
+    /// will not be hinted when preparing the statement.
+    ///
+    pub fn add_unchecked<T: 'a + TypeEncode<Db>>(&mut self, value: &'a T) {
+        self.positional.push(Argument { value, unchecked: true });
+    }
+
+    /// Add a named value to the argument collection.
+    pub fn add_as<T: 'a + TypeEncode<Db>>(&mut self, name: &'a str, value: &'a T) {
+        self.named.push((name, Argument { value, unchecked: false }));
+    }
+
+    /// Add an unchecked, named value to the arguments collection.
+    pub fn add_unchecked_as<T: 'a + TypeEncode<Db>>(&mut self, name: &'a str, value: &'a T) {
+        self.named.push((name, Argument { value, unchecked: true }));
+    }
+}
+
+impl<'a, Db: Database> Arguments<'a, Db> {
+    /// Reserves capacity for at least `additional` more positional parameters.
+    pub fn reserve_positional(&mut self, additional: usize) {
+        self.positional.reserve(additional);
+    }
+
+    /// Reserves capacity for at least `additional` more named parameters.
+    pub fn reserve_named(&mut self, additional: usize) {
+        self.named.reserve(additional);
+    }
+
+    /// Returns the number of positional and named parameters.
+    #[must_use]
+    pub fn len(&self) -> usize {
+        self.num_named() + self.num_positional()
+    }
+
+    /// Returns `true` if there are no positional or named parameters.
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// Clears the `Arguments`, removing all values.
+    pub fn clear(&mut self) {
+        self.named.clear();
+        self.positional.clear();
+    }
+
+    /// Returns the number of named parameters.
+    #[must_use]
+    pub fn num_named(&self) -> usize {
+        self.named.len()
+    }
+
+    /// Returns the number of positional parameters.
+    #[must_use]
+    pub fn num_positional(&self) -> usize {
+        self.positional.len()
+    }
+
+    /// Returns a reference to the argument at the location, if present.
+    pub fn get<'x, I: ArgumentIndex<'a, Db>>(&'x self, index: &I) -> Option<&'x Argument<'a, Db>> {
+        index.get(self)
+    }
+}
+
+impl<'a, Db: Database> Argument<'a, Db> {
+    /// Returns `true` if the argument is unchecked.
+    #[must_use]
+    pub fn unchecked(&self) -> bool {
+        self.unchecked
+    }
+
+    /// Returns the SQL type identifier of the argument.
+    ///
+    /// When the statement is prepared, the database will often infer the type
+    /// of the incoming argument. This method takes that (`ty`) along with the value of
+    /// the argument to determine the actual type identifier that will be sent when
+    /// the statement is executed.
+    ///
+    #[must_use]
+    pub fn type_id(&self, ty: &Db::TypeInfo) -> Db::TypeId {
+        self.value.type_id(ty)
+    }
+
+    /// Encode this argument into the output buffer, for use in executing the prepared statement.
+    ///
+    /// When the statement is prepared, the database will often infer the type
+    /// of the incoming argument. This method takes  that (`ty`) along with the value of
+    /// the argument to encode into the output buffer.
+    ///
+    pub fn encode<'x>(
+        &self,
+        ty: &Db::TypeInfo,
+        out: &mut <Db as HasOutput<'x>>::Output,
+    ) -> encode::Result<()> {
+        self.value.encode(ty, out)
+    }
+}
+
+/// A helper trait used for indexing into an [`Arguments`] collection.
+pub trait ArgumentIndex<'a, Db: Database> {
+    /// Returns a reference to the argument at this location, if present.
+    fn get<'x>(&self, arguments: &'x Arguments<'a, Db>) -> Option<&'x Argument<'a, Db>>;
+}
+
+// access a named argument by name
+impl<'a, Db: Database> ArgumentIndex<'a, Db> for str {
+    fn get<'x>(&self, arguments: &'x Arguments<'a, Db>) -> Option<&'x Argument<'a, Db>> {
+        arguments.named.iter().find_map(|(name, arg)| (*name == self).then(|| arg))
+    }
+}
+
+// access a positional argument by index
+impl<'a, Db: Database> ArgumentIndex<'a, Db> for usize {
+    fn get<'x>(&self, arguments: &'x Arguments<'a, Db>) -> Option<&'x Argument<'a, Db>> {
+        arguments.positional.get(*self)
+    }
+}
diff --git a/sqlx-core/src/lib.rs b/sqlx-core/src/lib.rs
index 04b75f8e..f42e030d 100644
--- a/sqlx-core/src/lib.rs
+++ b/sqlx-core/src/lib.rs
@@ -19,7 +19,7 @@
 #![allow(clippy::clippy::missing_errors_doc)]
 
 mod acquire;
-mod arguments;
+pub mod arguments;
 mod close;
 mod column;
 mod connect;
@@ -50,7 +50,7 @@ pub mod mock;
 pub mod blocking;
 
 pub use acquire::Acquire;
-pub use arguments::{Argument, Arguments};
+pub use arguments::Arguments;
 #[cfg(feature = "blocking")]
 pub use blocking::runtime::Blocking;
 pub use close::Close;
@@ -64,7 +64,7 @@ pub use error::{DatabaseError, Error, Result};
 pub use executor::Executor;
 pub use options::ConnectOptions;
 pub use query_result::QueryResult;
-pub use r#type::{Type, TypeEncode, TypeDecode};
+pub use r#type::{Type, TypeDecode, TypeEncode};
 pub use row::Row;
 #[cfg(feature = "actix")]
 pub use runtime::Actix;
diff --git a/sqlx-core/src/type.rs b/sqlx-core/src/type.rs
index 20f79e28..6a48c1f8 100644
--- a/sqlx-core/src/type.rs
+++ b/sqlx-core/src/type.rs
@@ -36,7 +36,7 @@ pub trait TypeEncode<Db: Database>: Type<Db> + Encode<Db> {
     /// Returns the SQL type identifier that best hints to the database
     /// at the incoming value for a bind parameter.
     #[allow(unused_variables)]
-    fn type_id_of(&self, ty: &Db::TypeInfo) -> Db::TypeId;
+    fn type_id(&self, ty: &Db::TypeInfo) -> Db::TypeId;
 
     /// Returns the Rust type name of this.
     #[doc(hidden)]