Quick refactor; need to post to production server