pushing working model to production, still could use some tweaking but will work