Added more macro's and begun to work on memory issues.