George

merging @thetmkay's changes into the bladesing app.