Aaron's latest prototype

Just loading it for archiving.