Everything working. Needs memory fixes