Progress, works now, will make into grunt task next