diff --git a/.gitignore b/.gitignore
index c9de38e..5df51aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@
 .env.test.local
 .env.production.local
 .vscode
+.idea
 
 npm-debug.log*
 yarn-debug.log*
diff --git a/src/actions/catalog.ts b/src/actions/catalog.ts
index 3e09c2e..a050ca0 100644
--- a/src/actions/catalog.ts
+++ b/src/actions/catalog.ts
@@ -1,14 +1,10 @@
 import { Dispatch } from "redux";
 import { createAction, getReturnOfExpression } from "typesafe-actions";
 
-import {
-  IServiceBinding,
-  IServiceBroker,
-  IServiceClass,
-  IServiceInstance,
-  IServicePlan,
-  ServiceCatalog,
-} from "../shared/ServiceCatalog";
+import { IClusterServiceClass } from "../shared/ClusterServiceClass";
+import { IServiceBinding, ServiceBinding } from "../shared/ServiceBinding";
+import { IServiceBroker, IServicePlan, ServiceCatalog } from "../shared/ServiceCatalog";
+import { IServiceInstance, ServiceInstance } from "../shared/ServiceInstance";
 import { IStoreState } from "../shared/types";
 
 export const checkCatalogInstall = createAction("CHECK_INSTALL");
@@ -35,10 +31,13 @@ export const receiveBindings = createAction("RECEIVE_BINDINGS", (bindings: IServ
   type: "RECEIVE_BINDINGS",
 }));
 export const requestClasses = createAction("REQUEST_PLANS");
-export const receiveClasses = createAction("RECEIVE_CLASSES", (classes: IServiceClass[]) => ({
-  classes,
-  type: "RECEIVE_CLASSES",
-}));
+export const receiveClasses = createAction(
+  "RECEIVE_CLASSES",
+  (classes: IClusterServiceClass[]) => ({
+    classes,
+    type: "RECEIVE_CLASSES",
+  }),
+);
 
 const actions = [
   checkCatalogInstall,
@@ -64,13 +63,7 @@ export function provision(
   parameters: {},
 ) {
   return async (dispatch: Dispatch<IStoreState>) => {
-    return ServiceCatalog.provisionInstance(
-      releaseName,
-      namespace,
-      className,
-      planName,
-      parameters,
-    );
+    return ServiceInstance.create(releaseName, namespace, className, planName, parameters);
   };
 }
 
@@ -91,7 +84,7 @@ export type ServiceCatalogAction = typeof actions[number];
 export function getBindings() {
   return async (dispatch: Dispatch<IStoreState>) => {
     dispatch(requestBindings());
-    const bindings = await ServiceCatalog.getServiceBindings();
+    const bindings = await ServiceBinding.list();
     dispatch(receiveBindings(bindings));
     return bindings;
   };
@@ -118,7 +111,7 @@ export function getClasses() {
 export function getInstances() {
   return async (dispatch: Dispatch<IStoreState>) => {
     dispatch(requestInstances());
-    const instances = await ServiceCatalog.getServiceInstances();
+    const instances = await ServiceInstance.list();
     dispatch(receiveInstances(instances));
     return instances;
   };
diff --git a/src/components/AppRepoList/AppRepoButton.tsx b/src/components/AppRepoList/AppRepoButton.tsx
index 99c1ead..da24798 100644
--- a/src/components/AppRepoList/AppRepoButton.tsx
+++ b/src/components/AppRepoList/AppRepoButton.tsx
@@ -28,11 +28,12 @@ export const AppRepoForm = (props: IAppRepoFormProps) => {
     <div className="app-repo-form">
       <h1>Add an App Repository</h1>
       <label>
-        Name:
+        <span>Name:</span>
         <input type="text" value={name} onChange={handleNameChange} />
       </label>
+      <br />
       <label>
-        URL:
+        <span>URL:</span>
         <input type="text" value={url} onChange={handleURLChange} />
       </label>
       <button className="button button-primary" onClick={handleInstallClick}>
diff --git a/src/components/BrokerView/AddBindingButton.tsx b/src/components/BrokerView/AddBindingButton.tsx
new file mode 100644
index 0000000..0378c2c
--- /dev/null
+++ b/src/components/BrokerView/AddBindingButton.tsx
@@ -0,0 +1,97 @@
+import * as React from "react";
+import * as Modal from "react-modal";
+
+interface IAddBindingButtonProps {
+  bindingName: string;
+  instanceRefName: string;
+  namespace: string;
+  addBinding: (bindingName: string, instanceName: string, namespace: string) => Promise<any>;
+}
+
+interface IAddBindingButtonState {
+  modalIsOpen: boolean;
+  // deployment options
+  bindingName: string;
+  instanceRefName: string;
+  namespace: string;
+  error?: string;
+}
+
+export class AddBindingButton extends React.Component<
+  IAddBindingButtonProps,
+  IAddBindingButtonState
+> {
+  public state = {
+    error: undefined,
+    modalIsOpen: false,
+    ...this.props,
+  };
+
+  public render() {
+    const { modalIsOpen, bindingName, instanceRefName, namespace } = this.state;
+    return (
+      <div className="AddBindingButton">
+        <button className="button button-primary button-small" onClick={this.openModal}>
+          Bind
+        </button>
+        <Modal isOpen={modalIsOpen} onRequestClose={this.closeModal}>
+          {this.state.error && (
+            <div className="container padding-v-bigger bg-action">{this.state.error}</div>
+          )}
+          <div className="bind-form">
+            <h1>Add Binding</h1>
+            <label htmlFor="binding-name">
+              <span>Name:</span>
+              <input
+                type="text"
+                id="binding-name"
+                value={bindingName}
+                onChange={this.handleNameChange}
+              />
+            </label>
+            <br />
+            <label htmlFor="instance-ref-name">
+              <span>Instance Name:</span>
+              <input
+                type="text"
+                id="instance-ref-name"
+                value={instanceRefName}
+                onChange={this.handleInstanceNameChange}
+              />
+            </label>
+            <br />
+            <label htmlFor="namespace">
+              <span>Namespace:</span>
+              <input
+                type="text"
+                id="namespace"
+                value={namespace}
+                onChange={this.handleNamespaceChange}
+              />
+            </label>
+            <button className="button button-primary" onClick={this.bind}>
+              Bind
+            </button>
+          </div>
+        </Modal>
+      </div>
+    );
+  }
+
+  private closeModal = () => this.setState({ modalIsOpen: false });
+  private openModal = () => this.setState({ modalIsOpen: true });
+  private handleNameChange = (e: React.ChangeEvent<HTMLInputElement>) =>
+    this.setState({ bindingName: e.target.value });
+  private handleInstanceNameChange = (e: React.ChangeEvent<HTMLInputElement>) =>
+    this.setState({ instanceRefName: e.target.value });
+  private handleNamespaceChange = (e: React.ChangeEvent<HTMLInputElement>) =>
+    this.setState({ namespace: e.target.value });
+  private bind = async () => {
+    await this.props.addBinding(
+      this.state.bindingName,
+      this.state.instanceRefName,
+      this.state.namespace,
+    );
+    this.closeModal();
+  };
+}
diff --git a/src/components/BrokerView/RemoveBindingButton.tsx b/src/components/BrokerView/RemoveBindingButton.tsx
new file mode 100644
index 0000000..19f523e
--- /dev/null
+++ b/src/components/BrokerView/RemoveBindingButton.tsx
@@ -0,0 +1,28 @@
+import * as React from "react";
+import { IServiceBinding, ServiceBinding } from "../../shared/ServiceBinding";
+
+interface IRemoveBindingButtonProps {
+  binding: IServiceBinding;
+  onRemoveComplete?: () => Promise<any>;
+}
+
+export class RemoveBindingButton extends React.Component<IRemoveBindingButtonProps> {
+  public render() {
+    return (
+      <div className="RemoveBindingButton">
+        <button className="button" onClick={this.handleRemoveBindingClick}>
+          Remove
+        </button>
+      </div>
+    );
+  }
+
+  private handleRemoveBindingClick = async () => {
+    const { binding, onRemoveComplete } = this.props;
+    const { name, namespace } = binding.metadata;
+    await ServiceBinding.delete(name, namespace);
+    if (onRemoveComplete) {
+      await onRemoveComplete();
+    }
+  };
+}
diff --git a/src/components/BrokerView/index.tsx b/src/components/BrokerView/index.tsx
index 101371b..bbecaf1 100644
--- a/src/components/BrokerView/index.tsx
+++ b/src/components/BrokerView/index.tsx
@@ -1,21 +1,20 @@
 import * as React from "react";
 import { Link } from "react-router-dom";
 
-import {
-  IServiceBinding,
-  IServiceBroker,
-  IServiceClass,
-  IServiceInstance,
-  IServicePlan,
-} from "../../shared/ServiceCatalog";
+import { IClusterServiceClass } from "../../shared/ClusterServiceClass";
+import { IServiceBinding, ServiceBinding } from "../../shared/ServiceBinding";
+import { IServiceBroker, IServicePlan } from "../../shared/ServiceCatalog";
+import { IServiceInstance } from "../../shared/ServiceInstance";
 import { Card, CardContainer } from "../Card";
 import DeprovisionButton from "../DeprovisionButton";
 import SyncButton from "../SyncButton";
+import { AddBindingButton } from "./AddBindingButton";
+import { RemoveBindingButton } from "./RemoveBindingButton";
 
 export interface IBrokerViewProps {
   bindings: IServiceBinding[];
   broker: IServiceBroker | undefined;
-  classes: IServiceClass[];
+  classes: IClusterServiceClass[];
   getCatalog: () => Promise<any>;
   instances: IServiceInstance[];
   plans: IServicePlan[];
@@ -56,6 +55,7 @@ export class BrokerView extends React.PureComponent<IBrokerViewProps> {
                   <th>Instance</th>
                   <th>Status</th>
                   <th>Message</th>
+                  <th />
                 </tr>
               </thead>
               <tbody>
@@ -79,7 +79,15 @@ export class BrokerView extends React.PureComponent<IBrokerViewProps> {
                         <code>{message}</code>
                       </td>
                       <td>
-                        <DeprovisionButton deprovision={deprovision} instance={instance} />
+                        <div className="button-list" style={{ display: "flex" }}>
+                          <DeprovisionButton deprovision={deprovision} instance={instance} />
+                          <AddBindingButton
+                            bindingName={instance.metadata.name + "-binding"}
+                            instanceRefName={instance.metadata.name}
+                            namespace={instance.metadata.namespace}
+                            addBinding={this.addbinding}
+                          />
+                        </div>
                       </td>
                     </tr>
                   );
@@ -109,8 +117,21 @@ export class BrokerView extends React.PureComponent<IBrokerViewProps> {
                     ["Port", secretPort],
                     ["Username", secretUsername],
                   ];
+                  const condition = [...binding.status.conditions].shift();
+                  const currentStatus = condition ? (
+                    <div className="condition">
+                      <div>
+                        <strong>{condition.type}</strong>: <code>{condition.status}</code>
+                      </div>
+                      <code>{condition.message}</code>
+                    </div>
+                  ) : (
+                    undefined
+                  );
+
                   const body = (
                     <div style={{ display: "flex", flexWrap: "wrap", flexDirection: "column" }}>
+                      {currentStatus}
                       {statuses.map(statusPair => {
                         const [key, value] = statusPair;
                         return (
@@ -134,7 +155,12 @@ export class BrokerView extends React.PureComponent<IBrokerViewProps> {
                       key={binding.metadata.name}
                       header={binding.metadata.name}
                       body={body}
-                      button={<span />}
+                      button={
+                        <RemoveBindingButton
+                          binding={binding}
+                          onRemoveComplete={this.props.getCatalog}
+                        />
+                      }
                     />
                   );
                   return card;
@@ -145,4 +171,10 @@ export class BrokerView extends React.PureComponent<IBrokerViewProps> {
       </div>
     );
   }
+
+  private addbinding = async (bindingName: string, instanceName: string, namespace: string) => {
+    const binding = await ServiceBinding.create(bindingName, instanceName, namespace);
+    await this.props.getCatalog();
+    return binding;
+  };
 }
diff --git a/src/components/ClassList/index.tsx b/src/components/ClassList/index.tsx
index eeb2598..498108c 100644
--- a/src/components/ClassList/index.tsx
+++ b/src/components/ClassList/index.tsx
@@ -1,13 +1,14 @@
 import * as React from "react";
 
-import { IServiceBroker, IServiceClass } from "../../shared/ServiceCatalog";
+import { IClusterServiceClass } from "../../shared/ClusterServiceClass";
+import { IServiceBroker } from "../../shared/ServiceCatalog";
 import { Card, CardContainer } from "../Card";
 
 export interface IClassListProps {
   broker: IServiceBroker | undefined;
-  classes: IServiceClass[];
+  classes: IClusterServiceClass[];
   getBrokers: () => Promise<IServiceBroker[]>;
-  getClasses: () => Promise<IServiceClass[]>;
+  getClasses: () => Promise<IClusterServiceClass[]>;
 }
 
 export class ClassList extends React.Component<IClassListProps> {
diff --git a/src/components/ClassView/index.tsx b/src/components/ClassView/index.tsx
index 6f54c2d..95feae5 100644
--- a/src/components/ClassView/index.tsx
+++ b/src/components/ClassView/index.tsx
@@ -1,12 +1,13 @@
 import * as React from "react";
 import { RouterAction } from "react-router-redux";
 
-import { IServiceClass, IServicePlan } from "../../shared/ServiceCatalog";
+import { IClusterServiceClass } from "../../shared/ClusterServiceClass";
+import { IServicePlan } from "../../shared/ServiceCatalog";
 import { Card, CardContainer } from "../Card";
 import ProvisionButton from "../ProvisionButton";
 
 interface IClassViewProps {
-  classes: IServiceClass[];
+  classes: IClusterServiceClass[];
   classname: string;
   getCatalog: () => Promise<any>;
   plans: IServicePlan[];
@@ -18,7 +19,7 @@ interface IClassViewProps {
     parameters: {},
   ) => Promise<any>;
   push: (location: string) => RouterAction;
-  svcClass: IServiceClass | undefined;
+  svcClass: IClusterServiceClass | undefined;
 }
 
 export class ClassView extends React.Component<IClassViewProps> {
diff --git a/src/components/DeprovisionButton/index.tsx b/src/components/DeprovisionButton/index.tsx
index 7a20d8d..4abbbbd 100644
--- a/src/components/DeprovisionButton/index.tsx
+++ b/src/components/DeprovisionButton/index.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { IServiceInstance } from "../../shared/ServiceCatalog";
+import { IServiceInstance } from "../../shared/ServiceInstance";
 
 interface IDeprovisionButtonProps {
   instance: IServiceInstance;
@@ -36,7 +36,7 @@ class DeprovisionButton extends React.Component<IDeprovisionButtonProps, IDeprov
       <div className="DeprovisionButton">
         {this.state.isDeprovisioning && <div>Deprovisioning...</div>}
         <button
-          className="button button-primary"
+          className="button button-primary button-small button-danger"
           disabled={this.state.isDeprovisioning}
           onClick={this.handleDeprovision}
         >
diff --git a/src/components/ProvisionButton/index.tsx b/src/components/ProvisionButton/index.tsx
index ab27c55..eba9eea 100644
--- a/src/components/ProvisionButton/index.tsx
+++ b/src/components/ProvisionButton/index.tsx
@@ -3,15 +3,16 @@ import AceEditor from "react-ace";
 import * as Modal from "react-modal";
 import { RouterAction } from "react-router-redux";
 
-import { IServiceClass, IServicePlan } from "../../shared/ServiceCatalog";
+import { IServicePlan } from "../../shared/ServiceCatalog";
 
 import "brace/mode/json";
 import "brace/theme/xcode";
+import { IClusterServiceClass } from "../../shared/ClusterServiceClass";
 
 interface IProvisionButtonProps {
   plans: IServicePlan[];
-  classes: IServiceClass[];
-  selectedClass?: IServiceClass;
+  classes: IClusterServiceClass[];
+  selectedClass?: IClusterServiceClass;
   selectedPlan?: IServicePlan;
   provision: (
     releaseName: string,
@@ -30,7 +31,7 @@ interface IProvisionButtonState {
   releaseName: string;
   namespace: string;
   selectedPlan: IServicePlan | undefined;
-  selectedClass: IServiceClass | undefined;
+  selectedClass: IClusterServiceClass | undefined;
   parameters: string;
   error?: string;
 }
diff --git a/src/components/ServiceList/index.tsx b/src/components/ServiceList/index.tsx
index ce0ca54..9b7f799 100644
--- a/src/components/ServiceList/index.tsx
+++ b/src/components/ServiceList/index.tsx
@@ -1,9 +1,10 @@
 import * as React from "react";
-import { IServiceBroker, IServiceClass, IServicePlan } from "../../shared/ServiceCatalog";
+import { IClusterServiceClass } from "../../shared/ClusterServiceClass";
+import { IServiceBroker, IServicePlan } from "../../shared/ServiceCatalog";
 
 interface IServiceListProps {
   brokers: IServiceBroker[];
-  classes: IServiceClass[];
+  classes: IClusterServiceClass[];
   plans: IServicePlan[];
   getCatalog: () => Promise<any>;
 }
diff --git a/src/containers/BrokerView.ts b/src/containers/BrokerView.ts
index f1e867b..1f50988 100644
--- a/src/containers/BrokerView.ts
+++ b/src/containers/BrokerView.ts
@@ -3,7 +3,8 @@ import { Dispatch } from "redux";
 
 import actions from "../actions";
 import { BrokerView } from "../components/BrokerView";
-import { IServiceBroker, IServiceInstance } from "../shared/ServiceCatalog";
+import { IServiceBroker } from "../shared/ServiceCatalog";
+import { IServiceInstance } from "../shared/ServiceInstance";
 import { IStoreState } from "../shared/types";
 
 interface IRouteProps {
diff --git a/src/index.css b/src/index.css
index 0106932..54b6a9f 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,6 +1,6 @@
 @import url("https://fonts.googleapis.com/css?family=Hind");
-@import url("https://d1d5nb8vlsbujg.cloudfront.net/bitnami-ui/3.0.0-alpha-12/bitnami.ui.min.css");
-@import url("https://d1d5nb8vlsbujg.cloudfront.net/bitnami-ui/3.0.0-alpha-12/bitnami.ui.components.min.css");
+@import url("https://d1d5nb8vlsbujg.cloudfront.net/bitnami-ui/3.0.0-alpha-17/bitnami.ui.min.css");
+@import url("https://d1d5nb8vlsbujg.cloudfront.net/bitnami-ui/3.0.0-alpha-17/bitnami.ui.components.min.css");
 
 body {
   margin: 0;
diff --git a/src/reducers/catalog.ts b/src/reducers/catalog.ts
index 5bca77d..52f3d9b 100644
--- a/src/reducers/catalog.ts
+++ b/src/reducers/catalog.ts
@@ -2,18 +2,15 @@ import { getType } from "typesafe-actions";
 
 import actions from "../actions";
 import { ServiceCatalogAction } from "../actions/catalog";
-import {
-  IServiceBinding,
-  IServiceBroker,
-  IServiceClass,
-  IServiceInstance,
-  IServicePlan,
-} from "../shared/ServiceCatalog";
+import { IClusterServiceClass } from "../shared/ClusterServiceClass";
+import { IServiceBinding } from "../shared/ServiceBinding";
+import { IServiceBroker, IServicePlan } from "../shared/ServiceCatalog";
+import { IServiceInstance } from "../shared/ServiceInstance";
 
 export interface IServiceCatalogState {
   bindings: IServiceBinding[];
   brokers: IServiceBroker[];
-  classes: IServiceClass[];
+  classes: IClusterServiceClass[];
   instances: IServiceInstance[];
   isChecking: boolean;
   isInstalled: boolean;
diff --git a/src/shared/ClusterServiceClass.ts b/src/shared/ClusterServiceClass.ts
new file mode 100644
index 0000000..d5f8295
--- /dev/null
+++ b/src/shared/ClusterServiceClass.ts
@@ -0,0 +1,51 @@
+import axios from "axios";
+import { ServiceCatalog } from "./ServiceCatalog";
+
+export interface IClusterServiceClass {
+  metadata: {
+    creationTimestamp: string;
+    name: string;
+    resourceVersion: string;
+    selfLink: string;
+    uid: string;
+  };
+  spec: {
+    bindable: boolean;
+    binding_retrievable: boolean;
+    clusterServiceBrokerName: string;
+    description: string;
+    externalID: string;
+    externalName: string;
+    planUpdatable: boolean;
+    tags: string[];
+    externalMetadata?: {
+      displayName: string;
+      documentationUrl: string;
+      imageUrl: string;
+      longDescription: string;
+      supportUrl: string;
+    };
+  };
+  status: {
+    removedFromBrokerCatalog: boolean;
+  };
+}
+
+export class ClusterServiceClass {
+  public static async get(namespace?: string, name?: string): Promise<IClusterServiceClass> {
+    const url = this.getLink(namespace, name);
+    const { data } = await axios.get<IClusterServiceClass>(url);
+    return data;
+  }
+
+  public static async list(namespace?: string): Promise<IClusterServiceClass[]> {
+    const instances = await ServiceCatalog.getItems<IClusterServiceClass>("/serviceinstances");
+    return instances;
+  }
+
+  private static getLink(namespace?: string, name?: string): string {
+    return `/api/kube/apis/servicecatalog.k8s.io/v1beta1${
+      namespace ? `/namespaces/${namespace}` : ""
+    }/clusterserviceclasses${name ? `/${name}` : ""}`;
+  }
+}
diff --git a/src/shared/ServiceBinding.ts b/src/shared/ServiceBinding.ts
new file mode 100644
index 0000000..6fef455
--- /dev/null
+++ b/src/shared/ServiceBinding.ts
@@ -0,0 +1,136 @@
+import axios from "axios";
+import { ICondition, ServiceCatalog } from "./ServiceCatalog";
+
+interface IK8sApiSecretResponse {
+  kind: string;
+  apiVersion: string;
+  metadata: {
+    selfLink: string;
+    resourceVersion: string;
+  };
+  data: {
+    database: string;
+    host: string;
+    password: string;
+    port: string;
+    username: string;
+  };
+}
+
+export interface IServiceBinding {
+  metadata: {
+    name: string;
+    selfLink: string;
+    uid: string;
+    resourceVersion: string;
+    creationTimestamp: string;
+    finalizers: string[];
+    generation: number;
+    namespace: string;
+  };
+  spec: {
+    externalID: string;
+    instanceRef: {
+      name: string;
+    };
+    secretName: string | undefined;
+    secretDatabase: string | undefined;
+    secretHost: string | undefined;
+    secretPassword: string | undefined;
+    secretPort: string | undefined;
+    secretUsername: string | undefined;
+  };
+  status: {
+    conditions: ICondition[];
+    asyncOpInProgress: boolean;
+    currentOperation: string;
+    reconciledGeneration: number;
+    operationStartTime: string;
+    externalProperties: {};
+    orphanMitigationInProgress: boolean;
+    unbindStatus: string;
+  };
+}
+
+export class ServiceBinding {
+  public static async create(
+    bindingName: string,
+    instanceRefName: string,
+    namespace: string = "default",
+  ) {
+    const url = ServiceBinding.getLink(namespace);
+    const { data } = await axios.post<IServiceBinding>(url, {
+      metadata: {
+        name: bindingName,
+      },
+      spec: {
+        instanceRef: {
+          name: instanceRefName,
+        },
+      },
+    });
+    return data;
+  }
+
+  public static async delete(name: string, namespace: string = "default") {
+    const url = this.getLink(namespace, name);
+    return axios.delete(url);
+  }
+
+  public static async get(namespace: string = "default", name: string) {
+    const url = this.getLink(namespace, name);
+    const { data } = await axios.get<IServiceBinding>(url);
+    return data;
+  }
+
+  public static async list(namespace: string = "default") {
+    const bindings = await ServiceCatalog.getItems<IServiceBinding>("/servicebindings");
+
+    // initiate with undefined secrets
+    for (const binding of bindings) {
+      binding.spec = {
+        ...binding.spec,
+        secretDatabase: undefined,
+        secretHost: undefined,
+        secretPassword: undefined,
+        secretPort: undefined,
+        secretUsername: undefined,
+      };
+    }
+
+    return Promise.all(
+      bindings.map(binding => {
+        const { secretName } = binding.spec;
+        const ns = binding.metadata.namespace;
+        return axios
+          .get<IK8sApiSecretResponse>(this.secretEndpoint(ns) + secretName)
+          .then(response => {
+            const { database, host, password, port, username } = response.data.data;
+            const spec = {
+              ...binding.spec,
+              secretDatabase: atob(database),
+              secretHost: atob(host),
+              secretPassword: atob(password),
+              secretPort: atob(port),
+              secretUsername: atob(username),
+            };
+            return { ...binding, spec };
+          })
+          .catch(err => {
+            // return with undefined secrets
+            return { ...binding };
+          });
+      }),
+    );
+  }
+
+  private static getLink(namespace?: string, name?: string): string {
+    return `/api/kube/apis/servicecatalog.k8s.io/v1beta1${
+      namespace ? `/namespaces/${namespace}` : ""
+    }/servicebindings${name ? `/${name}` : ""}`;
+  }
+
+  private static secretEndpoint(namespace: string = "default"): string {
+    return `/api/kube/api/v1/namespaces/${namespace}/secrets/`;
+  }
+}
diff --git a/src/shared/ServiceCatalog.ts b/src/shared/ServiceCatalog.ts
index 5c3459e..cd22f11 100644
--- a/src/shared/ServiceCatalog.ts
+++ b/src/shared/ServiceCatalog.ts
@@ -2,6 +2,8 @@ import axios from "axios";
 
 import * as urls from "../shared/url";
 import { AppRepository } from "./AppRepository";
+import { IClusterServiceClass } from "./ClusterServiceClass";
+import { IServiceInstance } from "./ServiceInstance";
 import { IAppRepository, IK8sList, IStatus } from "./types";
 
 export class ServiceCatalog {
@@ -24,89 +26,15 @@ export class ServiceCatalog {
   }
 
   public static async getServiceClasses() {
-    return ServiceCatalog.getItems<IServiceClass>("/clusterserviceclasses");
+    return this.getItems<IClusterServiceClass>("clusterserviceclasses");
   }
 
   public static async getServiceBrokers() {
-    return ServiceCatalog.getItems<IServiceBroker>("/clusterservicebrokers");
+    return this.getItems<IServiceBroker>("clusterservicebrokers");
   }
 
   public static async getServicePlans() {
-    return ServiceCatalog.getItems<IServicePlan>("/clusterserviceplans");
-  }
-
-  public static async getServiceBindings(): Promise<IServiceBinding[]> {
-    const bindings = await ServiceCatalog.getItems<IServiceBinding>("/servicebindings");
-
-    // initiate with undefined secrets
-    for (const binding of bindings) {
-      binding.spec = {
-        ...binding.spec,
-        secretDatabase: undefined,
-        secretHost: undefined,
-        secretPassword: undefined,
-        secretPort: undefined,
-        secretUsername: undefined,
-      };
-    }
-
-    return Promise.all(
-      bindings.map(binding => {
-        const { secretName } = binding.spec;
-        const { namespace } = binding.metadata;
-        return axios
-          .get<IK8sApiSecretResponse>(ServiceCatalog.secretEndpoint(namespace) + secretName)
-          .then(response => {
-            const { database, host, password, port, username } = response.data.data;
-            const spec = {
-              ...binding.spec,
-              secretDatabase: atob(database),
-              secretHost: atob(host),
-              secretPassword: atob(password),
-              secretPort: atob(port),
-              secretUsername: atob(username),
-            };
-            return { ...binding, spec };
-          })
-          .catch(err => {
-            // return with undefined secrets
-            return { ...binding };
-          });
-      }),
-    );
-  }
-
-  public static async provisionInstance(
-    releaseName: string,
-    namespace: string,
-    className: string,
-    planName: string,
-    parameters: {},
-  ) {
-    const { data } = await axios.post<IStatus>(
-      urls.api.serviceinstances.create(namespace),
-      {
-        apiVersion: "servicecatalog.k8s.io/v1beta1",
-        kind: "ServiceInstance",
-        metadata: {
-          name: releaseName,
-        },
-        spec: {
-          clusterServiceClassExternalName: className,
-          clusterServicePlanExternalName: planName,
-          parameters,
-        },
-      },
-      {
-        validateStatus: statusCode => true,
-      },
-    );
-
-    if (data.status === "Failure") {
-      throw new Error(data.message);
-    }
-
-    return data;
+    return this.getItems<IServicePlan>("clusterserviceplans");
   }
 
   public static async deprovisionInstance(instance: IServiceInstance) {
@@ -140,48 +68,25 @@ export class ServiceCatalog {
     return data;
   }
 
-  public static async getServiceInstances() {
-    return ServiceCatalog.getItems<IServiceInstance>("/serviceinstances");
-  }
-
   public static async isCatalogInstalled(): Promise<boolean> {
     try {
-      const { status } = await axios.get(ServiceCatalog.endpoint);
+      const { status } = await axios.get(this.endpoint);
       return status === 200;
     } catch (err) {
       return false;
     }
   }
 
-  private static endpoint: string = "/api/kube/apis/servicecatalog.k8s.io/v1beta1";
-
-  private static secretEndpoint = (namespace: string = "default") =>
-    `/api/kube/api/v1/namespaces/${namespace}/secrets/`;
-
-  private static async getItems<T>(endpoint: string): Promise<T[]> {
-    const response = await axios.get<IK8sList<T, {}>>(ServiceCatalog.endpoint + endpoint);
-    // const response = await axios.get<IK8sApiListResponse<T>>(ServiceCatalog.endpoint + endpoint);
+  public static async getItems<T>(resource: string, namespace?: string): Promise<T[]> {
+    const response = await axios.get<IK8sList<T, {}>>(
+      this.endpoint + (namespace ? `/namespaces/${namespace}` : "") + `/${resource}`,
+    );
     const json = response.data;
     return json.items;
   }
-}
 
-interface IK8sApiSecretResponse {
-  kind: string;
-  apiVersion: string;
-  metadata: {
-    selfLink: string;
-    resourceVersion: string;
-  };
-  data: {
-    database: string;
-    host: string;
-    password: string;
-    port: string;
-    username: string;
-  };
+  private static endpoint: string = "/api/kube/apis/servicecatalog.k8s.io/v1beta1";
 }
-
 export interface IK8sApiListResponse<T> {
   kind: string;
   apiVersion: string;
@@ -192,36 +97,6 @@ export interface IK8sApiListResponse<T> {
   items: T[];
 }
 
-export interface IServiceClass {
-  metadata: {
-    creationTimestamp: string;
-    name: string;
-    resourceVersion: string;
-    selfLink: string;
-    uid: string;
-  };
-  spec: {
-    bindable: boolean;
-    binding_retrievable: boolean;
-    clusterServiceBrokerName: string;
-    description: string;
-    externalID: string;
-    externalName: string;
-    planUpdatable: boolean;
-    tags: string[];
-    externalMetadata?: {
-      displayName: string;
-      documentationUrl: string;
-      imageUrl: string;
-      longDescription: string;
-      supportUrl: string;
-    };
-  };
-  status: {
-    removedFromBrokerCatalog: boolean;
-  };
-}
-
 export interface ICondition {
   type: string;
   status: string;
@@ -280,53 +155,3 @@ export interface IServicePlan {
     removedFromBrokerCatalog: boolean;
   };
 }
-
-export interface IServiceInstance {
-  metadata: {
-    name: string;
-    namespace: string;
-    selfLink: string;
-    uid: string;
-    resourceVersion: string;
-    creationTimestamp: string;
-    finalizers: string[];
-    generation: number;
-  };
-  spec: {
-    clusterServiceClassExternalName: string;
-    clusterServicePlanExternalName: string;
-    externalID: string;
-    clusterServicePlanRef: {
-      name: string;
-    };
-    clusterServiceClassRef: {
-      name: string;
-    };
-  };
-  status: { conditions: ICondition[] };
-}
-
-export interface IServiceBinding {
-  metadata: {
-    name: string;
-    selfLink: string;
-    uid: string;
-    resourceVersion: string;
-    creationTimestamp: string;
-    finalizers: string[];
-    generation: number;
-    namespace: string;
-  };
-  spec: {
-    externalID: string;
-    instanceRef: {
-      name: string;
-    };
-    secretName: string | undefined;
-    secretDatabase: string | undefined;
-    secretHost: string | undefined;
-    secretPassword: string | undefined;
-    secretPort: string | undefined;
-    secretUsername: string | undefined;
-  };
-}
diff --git a/src/shared/ServiceInstance.ts b/src/shared/ServiceInstance.ts
new file mode 100644
index 0000000..267d820
--- /dev/null
+++ b/src/shared/ServiceInstance.ts
@@ -0,0 +1,80 @@
+import axios from "axios";
+import { ICondition, ServiceCatalog } from "./ServiceCatalog";
+import { IStatus } from "./types";
+
+export interface IServiceInstance {
+  metadata: {
+    name: string;
+    namespace: string;
+    selfLink: string;
+    uid: string;
+    resourceVersion: string;
+    creationTimestamp: string;
+    finalizers: string[];
+    generation: number;
+  };
+  spec: {
+    clusterServiceClassExternalName: string;
+    clusterServicePlanExternalName: string;
+    externalID: string;
+    clusterServicePlanRef: {
+      name: string;
+    };
+    clusterServiceClassRef: {
+      name: string;
+    };
+  };
+  status: { conditions: ICondition[] };
+}
+
+export class ServiceInstance {
+  public static async create(
+    releaseName: string,
+    namespace: string,
+    className: string,
+    planName: string,
+    parameters: {},
+  ) {
+    const { data } = await axios.post<IStatus>(
+      this.getLink(namespace),
+      {
+        apiVersion: "servicecatalog.k8s.io/v1beta1",
+        kind: "ServiceInstance",
+        metadata: {
+          name: releaseName,
+        },
+        spec: {
+          clusterServiceClassExternalName: className,
+          clusterServicePlanExternalName: planName,
+          parameters,
+        },
+      },
+      {
+        validateStatus: statusCode => true,
+      },
+    );
+
+    if (data.status === "Failure") {
+      throw new Error(data.message);
+    }
+
+    return data;
+  }
+
+  public static async get(namespace?: string, name?: string): Promise<IServiceInstance> {
+    const url = this.getLink(namespace, name);
+    const { data } = await axios.get<IServiceInstance>(url);
+    return data;
+  }
+
+  public static async list(namespace?: string): Promise<IServiceInstance[]> {
+    const instances = await ServiceCatalog.getItems<IServiceInstance>("/serviceinstances");
+    return instances;
+  }
+
+  private static getLink(namespace?: string, name?: string): string {
+    return `/api/kube/apis/servicecatalog.k8s.io/v1beta1${
+      namespace ? `/namespaces/${namespace}` : ""
+    }/serviceinstances${name ? `/${name}` : ""}`;
+  }
+}