A Commit of sort

Remeber to fix prompt: Error when prompting sometimes...