Added a few more macros
The prompt is now stored on the heap