diff --git a/generators/new/templates/Makefile.tmpl b/generators/new/templates/Makefile.tmpl
index a984764..05e67c7 100644
--- a/generators/new/templates/Makefile.tmpl
+++ b/generators/new/templates/Makefile.tmpl
@@ -1,5 +1,8 @@
 GOFMT_FILES?=$$(find . -name '*.go' | grep -v vendor)
 
+PID = ./{{ .opts.Name }}.pid
+APP = ./bin/{{ .opts.Name }}
+
 all: fmt build
 
 fmt:
@@ -17,8 +20,27 @@ build:
 	find . -name ".DS_Store" -delete
 	dashi g graphql
 	go mod tidy
-	go build -ldflags "-X {{ .opts.Package }}/cmd.Version=`git rev-parse HEAD`" -o ./bin/{{ .opts.Name }}
+	go build -ldflags "-X {{ .opts.Package }}/cmd.Version=`git rev-parse HEAD`" -o $(APP)
 	go install
 
+
+serve: kill graphql start watch
+
+watch:
+	fswatch -x -o --event Created --latency 5 --event Updated --event Renamed -r -e '.*' -i '.*\.go$$'  . | xargs -n1 -I{}  make restart  &
+	fswatch -x -o --event Created --latency 5 --event Updated --event Renamed -r -e '.*' -i '\.graphql$$'  . | xargs -n1 -I{}  make graphql || make kill
+
+kill:
+	kill `cat $(PID)` || true
+
+restart: kill start
+
 graphql:
 	dashi g graphql
+
+start:
+	#go mod vendor
+	go build -o $(APP)
+	$(APP) server & echo $$! > $(PID)
+
+.PHONY: start restart kill graphql watch_graphql watch_go serve
diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go
index 1bfe5da..390c354 100644
--- a/packrd/packed-packr.go
+++ b/packrd/packed-packr.go
@@ -52,7 +52,7 @@ var _ = func() error {
 		"71b92b5f2ff73651aff7c9f40fca945e": "1f8b08000000000000ff94554d8fdb3610bdeb574c053490b68ab4c744800faedd260b6c778d4d7a2a7aa0a991c4864b6ac991edd4f07f2ff8217fb51b34be889c19cebc797c1c0f8c7f611d021b449288e7411b822c0148b956843b4add5aeace7f1552d5130d7e63c970ad3669e2369da07e5c975c3f57efdf376845a76cd5bdc80e55d51936f42f32fd9f7155cf5423d15cc777fa2def45c57bf1baa77a164d2371cb0cbe16a48dfdb76b3db62d93ba1a74e86dbf87520f64cb55a4e770a8d8202a8356cb0dc614ff15c5b56a45f7aabb4385861136699227097d1d103ea1d9a0014b66e404fb0420e400b8098b72e13f0940b306ffbb19f4e0ac0a3909ad1280c819b8db293f864d72489276541c321b4adc845239dc0b4ba8e6aaf1862c0734461b5fbbc1d681f18165b32e17525bcc7277c95e1bf56c7246702167b9d2861200d186b0d90c6e7dbe786c06ef6edfdd2600079749eaae5c19a1a8cd52e9b108d581561e7e5d555273267b6da9feb1490b9f218fc77e65c464e6dbbcea22add39fa226cb3bd22cf3c78a096e642877890cd2681428218f1c3de0367492e59045a28ac04b7e7629dee44888dddf6bd6647968dc797e98b9acb1f353197f6ceabeaae0f3e3f2b186f8c48289d32ee675b6f267c6bf74468f2aa48f3758cfe04dc0162a0414f5046eaac0b55247a44e2b0fb83dc9258bd8978cd89a59fc4ef82ecee354e5e380ea7bbb3f4a2b267136a3470addf15e38b04fdee053075ff9bbc5ecf4b8cb277c19d1d2ddf25b214cdead5ef7dfebae43f3adf35c6fd0b8104fa9b1e17e8c750833bf781c1ca136343c97526fb1f90da9d78dad01e08f3f2d19a1babdd76b707c402ae06cbfd2f6ca305eee972891f0509cd7f888ac417359239d738e03a505a4f3917a6dc4dfcca17386855395a2b79fbf0e989ea75a186c509160d2d6406644afa13cb964c5f71aa78af7c5511d0693a3e538d7e2b00a8c3c4de3b28637c7d1594ed61003e094594354edc976256c8043d0f755f572298cd3f5066df96142013370af3a738f6a7a518bf02d40afff02a1084dcb38ee0f0528dcd194f488ae00379de7a683c06f0ed9c5a1b3d170d23aeec8d5cc2f813a82e2f871d25962cb464971dc9c987bc0ed2f3be423b1b5c44fbcc767965db49a9fdf4bb88e2c3dfebd1653b9fcec994dff0bb3782c394d3f1b675c9882ff040000ffff8cebffe608080000",
 		"71fb4127cc35ea3659a1ab56afa2ea22": "1f8b08000000000000ff448d310a83401045fb7f8adfa98d39c0aa75aa10728345c720641d19c71058f6eec134e91eaf786f499b9af3217174cea689959d5c0560d475775e35c93d3e853deb86fdc00cd2c40f5b598324bb69790f39b7baf9dede629252bacbe94036010590cfef32c91c8fd73f19f00d0000ffff253ca1cb7f000000",
 		"76d8e5465e89c7b15d16a248bf7d3343": "1f8b08000000000000ff5c91c18edb201086ef3cc5c8176c696bf6b8b2e3bd546aab6ab5dd6dfb02148f632a0c042651a3c8ef5e41ec3ae96d60bef9f9f9474fde0502be0fd28ffa60c45ad493b6b58a91b76c61bea35404437013f090eaadf5390fbdbf2cdd556303dee41ebfa0ec312c88729377162d451183125b9fb78c0d47ab483b0b59e8fde513921a3194cbf14d0639c50a2e0c20201d83852111251f897c2384714a9ad1456a9e1e9f1eaf5f3a18fe90270026a4d1f50d70ef22f1877c37e6c7630317e01f9d25b4f4e1e7d9236f804bef8d56323912bfa3b31ce6ebd02fd79f1bf8fae3db6b1d2968bbd7c3f93f93099cab9a46b46519307a672356d03dc37aa8936459552d9b1953cec62dce940a745066fee6b7657e7dd7eb132823637c951376c59a7af19cdb00bb9bd44993c1ae58950b10ffa86d79d798bbcb7decf3caee44af4fa94c5e5bc6f04fde6d8f833c9a7bd72dfb1b0000ffff08fc1b1a59020000",
-		"775978b80f0b2d377a8b03201d2e5c1d": "1f8b08000000000000ff64905bcbda401086af33bf6208829f92dddc07a414d4b6d013584aef747527ebea1ed2dd6d34d8fcf79218e8e972de81f77966de7cda7ef8b2dfbe7bbfd9bd5acd662fb576123932272ce17cc9959fe34f54811a642db6e4a40f0b00614c85b54d78fca18d04a86daa20537e88d80d672f7ff42e20eb4470d8044a495340c66e41a7a17e592ef9e3128b4bf4aeb8c47b916291e2bd504134e7efa6e8843545674d3f47c68c57865a327813c10118ed9e4c6c294d088a438a8d385d85a208a0ad50544126fde94ae1698b2ce1e381dc3729f28fc39d7d8f1c605c5690fdf5829caf77fb5df2817264920c25824c8a78d6a870d21c25ac9798b4ecc661e218591ba122e6ecdb6fe2e7a71cf67d79b2927fa510b577ab83d20903b5ac112112beddbc5e1f72641e7979d4aefc5778c468179330066012a9fe57fb150000ffff0247ce0ce0010000",
+		"775978b80f0b2d377a8b03201d2e5c1d": "1f8b08000000000000ffb4934b6fdb3810c7cf9e4ff15faf103f6032d8c35e046417419d3406da4468daa20502c48c35961953a24a327ec0f6772ff448f3027aeb45e4700633bff9cfe8fdd5f9c7cfb7e7930f67d7ff9f44517fae8b1412a25039a3379499ed618fcc7109b1c28a8bd4ba01513219e304f278b783b465f0f2b28a3f1c64a9533a4d92da79a78b370144ca9818f33ce0ee419b94689e87983a99ad9ec41a51ff19d2803a5be50a948e43d0ec20c4dae950910d8f877277ef47f7de16a37bbf19053f0a7e33ca9c2a173fcc68ab7233dae6e6d08310c66686576cb056ae2032ba686a62c5a12dc1be7a45a9664b95b127d2b9ca38a64e6a674b760d2d44c0eb8e20896a674c9d17ea75e5f8faf63a58c75d88940d07a64eaafc4223438b5943e43645d0e9b636da3a269d1b957974c5b7a78a490387c3e17896a7f22b3baf6d7132cd7480e3952895f38c8bb3d3f1b40b6111f54f936450a7d5850fca1822f2ec561c63a98d79a4800fca05ac55982d88eaa36ac6d737884d954b085e7111f0ceb10a9c56a2aac0c56c8b7f7ff9be9469eb6bec4f5c0991423808464f0e7b10ba3a6f6466a3a80748ecb1512ef310c53f1093dd01c8d592e1b861c2d11f04b991ad00bf67795469bf6fec4a3aa2ea1b53a7d6713a5301513f998c07d32a2cb807266a7b68b5aeef446db2f8ed2a50134d9dbfdb9d68feb6e75bf134d2e6443d4c8723f06c6111457fe1bf96834826175797dfe376b88f82be987badebed2bcb3659e967000000ffff1009d5301b040000",
 		"77c2152146c50785ef094d226959aa1d": "1f8b08000000000000ff448f414fc3300c85cff3af78ea09269400774e9cb84d883f90a56e17c8e2e0b843d5d4ff8e4a2771f37bb6dfd35743fc0a2343b949beb036a274aea2863bda7563b2d3747451ce7e94e3340c218baf523b02baeb154eaa3577b8652c8b8f52863476744fe43d3e4ea9614899f193724611c371ad1ab9b006e31e613239074b31e43c3bf27e7d7b3334d60b3784869e2b979e4b9c91ca27474b523088629649116a7d40e87b8432ff9f266eeb1acadf5352c689951d91cd95f17e0345339da2e14abb572905c0be4a75ebbc95fcf9431ab1dfa0dc266921ba04c581f5b042bfe0f9713336f544bf010000ffff0040a89f53010000",
 		"77c560e11a20ba4efc70c029a1ac396d": "1f8b08000000000000ff54cdb14a04311087f13af3147f52c89d2c7788dd82d5e90b785889c56c329b0d9a64992436cbbebb205a5cfd83ef5bd97d7210786e3c7115a298d6a20d073236c4b6f4e9e44a3ad7757e783cbb32295b3a127db3e22ae22fc9e30977bf70ba949438fb8dcc5b951180ad22de0e64ae4bd136c23eff6df00faf3dbf8c987b7607973cee6f42035843c5fb476d1a733842548b622363545ad78c1cbfc8ec03edf4130000ffff5a415dddc9000000",
 		"781615fcea678b680e71cbb28e5522e2": "1f8b08000000000000ff548e410ac2400c45f7738a7f82612a882587f00a123b41854a8624d645e9dd65842eba7deff1f92eb68851029a5a10c6329604b84c264168ecfe55aba972f09d5d7a595f3ccbd4ad7a3c4cbcb3dd635db3b6f07ce5b76cdbadca92808f8b1dfa7df8009fea41184e975c72c9c3ff94ce8473fa050000ffff812a367fa7000000",