Added beau's code to the project. First prototype?