Finally got the Stock App Replacment sorted (Fixes #8)