Pull in files from first go at this over on the brs02 server
cleanup