I wasn't sure what conventions you were using so please move stuff around as you see fit.