Added a little to the actual methods. They are not yet correct &
complete.