Pretty much done implementing, will test in lab