diff --git a/flowblocks/button-block.ini b/flowblocks/button-block.ini
new file mode 100644
index 0000000..d463f2c
--- /dev/null
+++ b/flowblocks/button-block.ini
@@ -0,0 +1,39 @@
+[block]
+name = Button Block
+button_label = Button Block
+
+[fields.label]
+label = Button Label
+type = string
+
+[fields.link]
+label = Button link
+type = string
+
+[fields.icon]
+label = Button icon
+type = select
+choices = code-fork, envelope
+choice_labels = Code fork, Envelope
+width = 1/4
+
+[fields.type]
+label = Button type
+type = select
+choices = default, primary, success, info, warning, danger, link
+choice_labels = Default, Primary, Success, Info, Warning, Danger, Link
+default = Default
+width = 1/4
+
+[fields.size]
+label = Button size
+type = select
+choices = lg, md, sm, xs
+choice_labels = Large, Medium, Small, Extra small
+default = Large
+width = 1/4
+
+[fields.block]
+label = Is a block button?
+type = boolean
+width = 1/4
\ No newline at end of file
diff --git a/flowblocks/text-block.ini b/flowblocks/text-block.ini
new file mode 100644
index 0000000..fdeb5af
--- /dev/null
+++ b/flowblocks/text-block.ini
@@ -0,0 +1,26 @@
+[block]
+name = Text Block
+button_label = Rich Text
+
+[fields.title]
+label = Title
+description = Markdown
+type = markdown
+
+[fields.text]
+label = Text
+description = reStructuredText
+type = rst
+
+[fields.image]
+label = Image 
+type = select
+source = record.attachments.images
+width = 1/4
+
+[fields.image_alignment]
+label = Image Alignment
+type = select
+choices = left, right
+choice_labels = Left, Right
+width = 1/4
\ No newline at end of file
diff --git a/templates/blocks/button-block.html b/templates/blocks/button-block.html
new file mode 100644
index 0000000..08d38f7
--- /dev/null
+++ b/templates/blocks/button-block.html
@@ -0,0 +1,3 @@
+<a class="btn btn-{{ this.type }} btn-{{ this.size }} {% if this.block %}btn-block{% endif %}" href="{{ this.link }}" role="button">
+<i class="fa fa-{{ this.icon }}" aria-hidden="true"></i> {{ this.label }}
+</a>
\ No newline at end of file
diff --git a/templates/blocks/text-block.html b/templates/blocks/text-block.html
new file mode 100644
index 0000000..423548f
--- /dev/null
+++ b/templates/blocks/text-block.html
@@ -0,0 +1,2 @@
+{% if this.title %}<h3>{{ this.title }}</h3>{% endif %}
+<p>{% if this.image %}<p><img src="{{ this.image }}" class="hidden-sm-down pull-sm-{{ this.image_alignment }}"></p>{% endif %} {{ this.text }}</p>