Got first cut of features tested and working.