attempt at fixing watch/serve not working together