Removed dynamic allocation stuff, will make new branch